some small tweaks and utility methods