Fixed some issues due to merge