Fixes to swaplogger for common usage & Mer EGL requirements