Fix silly bugs