Fixed merge issues from previous broken commits