More BadAss fixes.