Added invalidate to various places