Fixed some Stuff detected by Kibit.