Fix some PROBLEMS