Bug fixes, remove some stack trace prints that result in spam