Fixed merge issues from work done before fork