Some fast fixes