Something seems still broken. Random fixes