Fixed some various things (very specific commit message)