Merge cleanup
Fix configure step