Minor code cleanup
Minor report fixes