Some more small changes to get thigns installed correctly.