Better/safer build/sign