Fixed warnings in Brock's code