Fix for bugs & other bad things