Small changes, removing event errors