Minor fixes, need to update JS returns