Some screwdriver fixes