Fixes manddated by testing