Removed confirmable, other fixes