Updated solution and platform.mk