Package change and other minor fixes