Some temp fixes for version and for base directory