Fix some stupid problems