Updated to respect --prefix