Resolved mantis 2407, 2412, 2420