Fixes for merge. Ready for REVIEW.