more coficiation fixes