Some compile fixes oops