c7a8dd7 various fixes