Fixing Boko's noobish mistakes