couple of last minuite fixes