Bug fixes I forgot the first time around