Minor fixes, keys