Style / build / prod fixes