Gone bug hunting; Fixed them!