Small fixes, ad ignored line 19