Small fold and rise fixes