Bug fixes according specification