Manual modifications - crossing fingers
Some little fixes