Cleaning up some compile issues/