Minor changes, prepare for merging