post completion bug fixes