Fixes and modifications