Partial fixes, still broken