Some more updates lost from previous branch