Bug fixes + bump API version