Fixes and temporary color