Super awesome fixes