Cleanups and fixes for older Kivy versions