Various updates / fixes