Report fix
Final fixes for the reporting command also changes for a method in the
library