Fix some installer issues