Just fixes, not enough though