Fixes and style