Fixes in KP serialization and Scheduling