! Two issue fixes