FInal fixes