Fixes for submitted issues (Indentation and absent libfunctioncall match)