Implement change requests by @sebix