Extended installation scripts (incl. bug fixes)