Fixed support lib imports