Fixed some installer issues