Various ficzes I forgot to commit