Couple more problems, clean up some boilerplate