Fixed some more funniness