Fix silly bugs.