Fixed two really really dumb bugs