Fixed things that are still broken