Fixed some silly bugs on addon loading