Some minor tweaks fixing rbhandle scared coding style