Commit after fixing some issues