Influence of surface geometry and heating on the flow structure in wall-bounded flows