Fixes from Chengus