Fix for buildpath issues