Fixing issues after style update