Fixed "extra ;" warnings & "unused 'renamed'" warning