Fixed some boilerplate stuff