Style fixes

Resolves #1293 and #1297