Fixed errors arising from support libraries thanks Matt Tyndall