Minor additions & fixes