Minor changes to low level code