Minor (but nessessary) improvments and fixes