Fix for running from alternative directories