Several fix