v1.5 various fixes