Fixes and new style