Fixes as discussed