Fixes and style changes