Fixed path and extra, fixed aliases