Some bugs to fix