Fixes for 428 task.