Major changes - Bug fixes