Fixes

Missed the Elijah content.
Small fixes and tweaks for Bouncy Castle addition.