Fixed some API version requirements