Customization and fixes for nibs