Various fixes, still broken