Fixes for previous merges (and additional file added for murmur)