Buildozer fixes