[BUGFIX] Cleanup and bugfixing to ensure functionality in 6.2