[FOLD] compile and style fixes