Few changes to make commands server compatible