Some smaller bugs