Fixes and cosmetics