Implement draw circle, various fixes for Android