Changed path to includepath for readability and fixed check that would break cmd_archiver