Fix some typing