Latest changes
fixes