prefix and issue fixes