Added suggestions indicated by Marek.