Constants fixing