Add modman and potential error fix