More fixes for LOGBOX-15