Commit recent fixes