Fix minor issues, cleanup