Bug fixes for get box + cleanups