Various clean up