Fixes, but still broken