Constants fixes