Fixes for task-1 & 2