Some more stlport changes after feedback from Goober