Blur fixes

Cleanup of #120