0.16.05 (Nivve) PetBazooka's fixes