secure and build tweaks