Merging fixes for testing