Minor fixes, still broken