Small changes

A few tweaks and Panda suggestions.