Changes for buildozer compatability