Some installer work...