last quick fixes