Add changes suggested by Marek