Some fixes for unforgiving drivers :D