Fix some finals bugs