:) Some fixes