Some small changes because of fun times.