Build break fixes, few other nitty gritty details.