Some more issue fixes