Fix loadpath to be more generic