Awesome fixes