Fix some broken