Minor fixes, remove hard-coded ids