Some reported issues solved