three fixes, thanks to diracdeltas