Changes for my own build process