Some minor fixes: rc6