fix for some event errors and return values