bug fixes in Platform