Modify section Functions to adapt to Class model (Fix)

Just some more small bug fixes.
Hopefully this was the last one!!!

Signed-off-by: Bruno Nocera Zanette <brunonzanette@gmail.com>