Fixes, new uniform