Some slight runtime enhancements