More small bug fixes after automated testing