Fixes for clean vagrant build