bug fixes in platform