various issue fixes