#2 Fix property notices, trimmings+