adds some conventional fixes