More bugs resolved.