Fixed issues with pre and post update tasks