Fix package explorer bugs

Fix both bug #741 and #742