Fixes and mods