Fixes for style builded version