More awesome fixes