random fixes related to 1795