Fixes for relative requires and constant warnings

Either this or #109