Small fixes, still broken