Attempts at fixes