Function/Action fixes.