Fixes for relative requires and constant warnings