Hotfixes for shmir