Fix minor issues to make stuff runnable