Sarnia fixes