Build & approve system fixes/features