Fixing more weak parts