Final misc fixes