Small fixes for issues reported in forum + Doc API