Bug fixes in reception