Fixes and adequation