Fix some special cases